From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon, 18 Feb 2013 21:06:53 +0000 (-0500)
Subject: shellEntry: Don't navigate forward before popping up the menu
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4759
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=75589b44504ddd449d4b142ff8f858cfa0bab70c;p=gnome-shell.git

shellEntry: Don't navigate forward before popping up the menu

Doing it before the grab messes up the grab helper's tracking
of where the focus was before, leading to it not tracking the
saved focus correctly, meaning that when we pop the menu back
down with escape, it doesn't restore focus correctly.

https://bugzilla.gnome.org/show_bug.cgi?id=694123
---

diff --git a/js/ui/shellEntry.js b/js/ui/shellEntry.js
index 5ca730c86..b71c809f1 100644
--- a/js/ui/shellEntry.js
+++ b/js/ui/shellEntry.js
@@ -74,12 +74,12 @@ const EntryMenu = new Lang.Class({
         if (this._passwordItem)
             this._updatePasswordItem();
 
+        this.parent(animate);
+        this._entry.add_style_pseudo_class('focus');
+
         let direction = Gtk.DirectionType.TAB_FORWARD;
         if (!this.actor.navigate_focus(null, direction, false))
             this.actor.grab_key_focus();
-
-        this.parent(animate);
-        this._entry.add_style_pseudo_class('focus');
     },
 
     close: function(animate) {